From: Kenichi Handa <handa@gnu.org>
Date: Sat, 27 Apr 2013 13:35:45 +0000 (+0900)
Subject: merge trunk
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~358
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=289e303f3da7ad4c8d19181ca6b48d2832098993;p=emacs.git

merge trunk
---

289e303f3da7ad4c8d19181ca6b48d2832098993